From 9f930c08a62bd1d33fc991f840c06fdd2b3220d8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Wed, 5 Oct 2016 19:37:44 +0200
Subject: [PATCH] ui: Don't unnecessarily set GtkEntry:invisible-char

---
 gtk/ui/gtkcoloreditor.ui       | 1 -
 gtk/ui/gtkfontchooserwidget.ui | 2 --
 gtk/ui/gtkprintunixdialog.ui   | 5 -----
 tests/testgtk.css              | 2 --
 testsuite/gtk/cssprovider.c    | 8 ++++----
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index f0d7b8ea3c..ecaf9fa8ea 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -58,7 +58,6 @@
               <object class="GtkEntry" id="entry">
                 <property name="visible">1</property>
                 <property name="can-focus">1</property>
-                <property name="invisible-char">•</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 48786f1463..bb27c83887 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -115,7 +115,6 @@
                   <object class="GtkEntry" id="preview">
                     <property name="visible">1</property>
                     <property name="can-focus">1</property>
-                    <property name="invisible-char">•</property>
                     <property name="placeholder-text" translatable="yes">Preview text</property>
                     <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
                   </object>
@@ -144,7 +143,6 @@
                   <object class="GtkSpinButton" id="size_spin">
                     <property name="visible">1</property>
                     <property name="can-focus">1</property>
-                    <property name="invisible-char">•</property>
                     <property name="adjustment">spin_adjustment</property>
                     <signal name="output" handler="output_cb"/>
                   </object>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index f20305a581..0d14d4095d 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -269,7 +269,6 @@
                                     <property name="can-focus">1</property>
                                     <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
-                                    <property name="invisible-char">•</property>
                                     <property name="activates-default">1</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="page_range_entry-atkobject">
@@ -345,7 +344,6 @@
                                     <property name="visible">1</property>
                                     <property name="can-focus">1</property>
                                     <property name="valign">baseline</property>
-                                    <property name="invisible-char">•</property>
                                     <property name="activates-default">1</property>
                                     <property name="adjustment">copies_spin_adjustment</property>
                                     <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -601,7 +599,6 @@
                                         <property name="visible">1</property>
                                         <property name="valign">baseline</property>
                                         <property name="can-focus">1</property>
-                                        <property name="invisible-char">•</property>
                                         <property name="adjustment">scale_spin_adjustment</property>
                                         <property name="digits">1</property>
                                       </object>
@@ -1028,8 +1025,6 @@
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                 <property name="tooltip-text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="invisible-char">•</property>
-                                <property name="invisible-char-set">1</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="print_at_entry-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes">Time of print</property>
diff --git a/tests/testgtk.css b/tests/testgtk.css
index 3c5002ff05..262f4247d7 100644
--- a/tests/testgtk.css
+++ b/tests/testgtk.css
@@ -12,8 +12,6 @@
     -GtkToolbar-button-relief: none;
     -GtkButtonBox-child-min-width: 0;
     -GtkButtonBox-child-min-height: 0;
-    -GtkArrow-arrow-scaling: 1.0;
-    -GtkEntry-invisible-char: 10046;
 
     font-family: Sans;
     font-size: 12px;
diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c
index d3606bfe3a..e6381caf8d 100644
--- a/testsuite/gtk/cssprovider.c
+++ b/testsuite/gtk/cssprovider.c
@@ -33,13 +33,13 @@ test_section_in_style_property (void)
   provider = gtk_css_provider_new ();
   g_signal_connect (provider, "parsing-error",
                     G_CALLBACK (assert_section_is_not_null), NULL);
-  gtk_css_provider_load_from_data (provider, "* { -GtkEntry-invisible-char: random garbage goes here; }", -1, NULL);
+  gtk_css_provider_load_from_data (provider, "* { -GtkWindow-decoration-button-layout: random garbage goes here; }", -1, NULL);
 
-  widget_class = g_type_class_ref (GTK_TYPE_ENTRY);
-  pspec = gtk_widget_class_find_style_property (widget_class, "invisible-char");
+  widget_class = g_type_class_ref (GTK_TYPE_WINDOW);
+  pspec = gtk_widget_class_find_style_property (widget_class, "decoration-button-layout");
   g_assert (pspec);
   path = gtk_widget_path_new ();
-  gtk_widget_path_append_type (path, GTK_TYPE_ENTRY);
+  gtk_widget_path_append_type (path, GTK_TYPE_WINDOW);
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   gtk_style_provider_get_style_property (GTK_STYLE_PROVIDER (provider), path, 0, pspec, &value);
-- 
2.30.2